bitkeeper revision 1.1327.2.7 (42692f39Ootfn2QyViUck00eh0wT7Q)

Remove deferred and dead code.
Signed-off-by: Mike Wray <mike.wray@hp.com>

diff --git a/tools/python/xen/xend/EventServer.py b/tools/python/xen/xend/EventServer.py
index 13bb7a3daa1f13b32655a7b9f2427b273ca7db62..d9124570dd84d2ee1d522bef92f1d0406b680355 100644 (file)
--- a/tools/python/xen/xend/EventServer.py
+++ b/tools/python/xen/xend/EventServer.py
@@ -132,7 +132,7 @@ class EventServer:
         if async:
             reactor.callLater(0, self.call_handlers, event, val)
         else:
-            self.notify_handlers(event, val)
+            self.call_handlers(event, val)
 
     def call_handlers(self, event, val):
         """Internal method to call event handlers.

diff --git a/tools/python/xen/xend/XendMigrate.py b/tools/python/xen/xend/XendMigrate.py
index f7515d444df1e5b1ebbcd99f76aa32e5626ca0a3..e087475b9d1b92b8ae4edcca13cbeb3ddad91d34 100644 (file)
--- a/tools/python/xen/xend/XendMigrate.py
+++ b/tools/python/xen/xend/XendMigrate.py
@@ -197,8 +197,6 @@ class XfrdInfo:
         """Add an error to the error list.
         Returns the error added.
         """
-        #while isinstance(err, Failure):
-        #    err = err.value
         if err not in self.errors:
             self.errors.append(err)
         return err
@@ -386,8 +384,6 @@ class XendMigrateInfo(XfrdInfo):
         self.state = 'ok'
         self.dst_dom = dom
         self.xd.domain_destroy(self.src_dom)
-        #if not self.deferred.called:
-        #    self.deferred.callback(self)
 
     def connectionLost(self, reason=None):
         print 'XendMigrateInfo>connectionLost>', reason
@@ -437,8 +433,6 @@ class XendSaveInfo(XfrdInfo):
     def xfr_save_ok(self, xfrd, val):
         self.state = 'ok'
         self.xd.domain_destroy(self.src_dom)
-        #if not self.deferred.called:
-        #    self.deferred.callback(self)
 
     def connectionLost(self, reason=None):
         print 'XendSaveInfo>connectionLost>', reason
@@ -479,8 +473,6 @@ class XendRestoreInfo(XfrdInfo):
         dom = int(sxp.child0(val))
         dominfo = self.xd.domain_get(dom)
         self.state = 'ok'
-        if not self.deferred.called:
-            self.deferred.callback(dominfo)
          
     def connectionLost(self, reason=None):
         XfrdInfo.connectionLost(self, reason)
@@ -548,7 +540,6 @@ class XendMigrate:
         Remove the session from the table when it finishes.
 
         @param info: session
-        @return: deferred
         """
         self._add_session(info)
         try:
@@ -563,7 +554,6 @@ class XendMigrate:
         @param dominfo:  domain info
         @param host: destination host
         @param port: destination port
-        @return: deferred
         """
         xid = self.nextid()
         info = XendMigrateInfo(xid, dominfo, host, port, live, resource)
@@ -574,7 +564,6 @@ class XendMigrate:
 
         @param dominfo:  domain info
         @param file: destination file
-        @return: deferred
         """
         xid = self.nextid()
         info = XendSaveInfo(xid, dominfo, file)